--- /dev/null
- From c302d1083869a891fe8d75f8ac9be22dcb3e873f Mon Sep 17 00:00:00 2001
++From 33b01a4a4027d9a7058560d48d934a91c4b2989f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:24 -0500
+Subject: Remove files that appear to be incompatible with the DFSG.
+
+Files that appear to be incompatible with the DFSG have been removed.
+
+A number of files have been removed from this package because their
+licenses are not compatible with the Debian Free Software Guidelines
+(DFSG), or because it wasn't completely clear that their licenses are
+compatible.
+
+In particular, all of the files which are covered under the GFDL and
+have invariant sections have been removed in accordance with this
+General Resolution: http://www.debian.org/vote/2006/vote_001.
+
+The files that have been removed, but still appear to be
+distributable, have been moved to packages in Debian's non-free
+section.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Status: new
+---
- Makefile.in | 30 +---
- configure.in | 4 +-
- doc/misc/Makefile.in | 490 +-------------------------------------------------
++ Makefile.in | 25 +--
++ configure.in | 6 +-
++ doc/misc/Makefile.in | 607 +-------------------------------------------------
+ lisp/help.el | 10 +-
- 4 files changed, 16 insertions(+), 518 deletions(-)
++ 4 files changed, 16 insertions(+), 632 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
- index 5e0d128..8162889 100644
++index 9a9be4f..0935af2 100644
+--- a/Makefile.in
++++ b/Makefile.in
- @@ -139,12 +139,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
++@@ -135,12 +135,7 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
+ # since there are now many packages documented with the texinfo
+ # system, it is inappropriate to imply that it is part of Emacs.
+ infodir=@infodir@
+-INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \
- - ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
- - eshell eudc flymake forms gnus idlwave info mairix-el \
++- ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc \
++- ert eshell eudc flymake forms gnus idlwave info mairix-el \
+- message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \
+- reftex remember sasl sc semantic ses sieve smtpmail speedbar \
+- tramp url vip viper widget woman
++INFO_FILES=efaq
+
- # Directory for local state files for all programs.
- localstatedir=@localstatedir@
- @@ -270,7 +265,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
- SUBDIR = lib-src src lisp
-
- # The subdir makefiles created by config.status.
- -SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
- +SUBDIR_MAKEFILES = lib-src/Makefile doc/misc/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
-
- # Subdirectories to install, and where they'll go.
- # lib-src's makefile knows how to install it, so we don't do that here.
- @@ -357,10 +352,7 @@ Makefile: config.status $(srcdir)/src/config.in \
- $(srcdir)/Makefile.in \
- $(srcdir)/src/Makefile.in \
- $(srcdir)/lib-src/Makefile.in \
- - $(srcdir)/doc/emacs/Makefile.in \
- $(srcdir)/doc/misc/Makefile.in \
- - $(srcdir)/doc/lispref/Makefile.in \
- - $(srcdir)/doc/lispintro/Makefile.in \
- $(srcdir)/oldXMenu/Makefile.in \
- $(srcdir)/lwlib/Makefile.in \
- $(srcdir)/leim/Makefile.in \
- @@ -701,10 +693,7 @@ mostlyclean: FRC
- (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
++ # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
++ HAVE_MAKEINFO=@HAVE_MAKEINFO@
++@@ -768,10 +763,7 @@ mostlyclean: FRC
+ (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
++ (cd lib; $(MAKE) $(MFLAGS) mostlyclean)
+ (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean)
+ (cd leim; $(MAKE) $(MFLAGS) mostlyclean)
+
+ ### `clean'
- @@ -720,10 +709,7 @@ clean: FRC
- (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
++@@ -788,10 +780,7 @@ clean: FRC
+ (cd lwlib; $(MAKE) $(MFLAGS) clean)
++ (cd lib; $(MAKE) $(MFLAGS) clean)
+ (cd lib-src; $(MAKE) $(MFLAGS) clean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
+ (cd leim; $(MAKE) $(MFLAGS) clean)
+
+ ### `bootclean'
- @@ -744,10 +730,7 @@ distclean: FRC
- (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
++@@ -813,10 +802,7 @@ distclean: FRC
+ (cd lwlib; $(MAKE) $(MFLAGS) distclean)
++ (cd lib; $(MAKE) $(MFLAGS) distclean)
+ (cd lib-src; $(MAKE) $(MFLAGS) distclean)
+- (cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
+ (cd doc/misc && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean)
+ (cd leim; $(MAKE) $(MFLAGS) distclean)
+ (cd lisp; $(MAKE) $(MFLAGS) distclean)
+ ${top_distclean}
- @@ -760,10 +743,7 @@ bootstrap-clean: FRC
- (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
++@@ -830,10 +816,7 @@ bootstrap-clean: FRC
+ (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
++ (cd lib; $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
- ${top_bootclean}
- @@ -808,10 +788,7 @@ dist:
++ [ ! -f config.log ] || mv -f config.log config.log~
++@@ -889,10 +872,7 @@ dist:
+ .PHONY: info dvi dist check html
+
- info-real:
++ info-real:
+- (cd doc/emacs; $(MAKE) $(MFLAGS) info)
+ (cd doc/misc; $(MAKE) $(MFLAGS) info)
+- (cd doc/lispref; $(MAKE) $(MFLAGS) info)
+- (cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+
+ force-info:
+ # Note that man/Makefile knows how to put the info files in $(srcdir),
- @@ -850,10 +827,7 @@ check-info-dir: info
++@@ -931,10 +911,7 @@ check-info-dir: info
+ echo "info/dir is OK"
+
+ dvi:
+- (cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
+ (cd doc/misc; $(MAKE) $(MFLAGS) dvi)
+- (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
+- (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
+
+ #### Bootstrapping.
+
+diff --git a/configure.in b/configure.in
- index 05b724f..958903d 100644
++index ad9966b..101ce5c 100644
+--- a/configure.in
++++ b/configure.in
- @@ -3123,8 +3123,8 @@ AC_EGREP_CPP(yes..yes,
- CPP_NEED_TRADITIONAL=yes)
++@@ -3819,11 +3819,11 @@ dnl This will work, but you get a config.status that is not quite right
++ dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html).
++ dnl That doesn't have any obvious consequences for Emacs, but on the whole
++ dnl it seems better to just live with the duplication.
++-SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
+++SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
+
- AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
- - doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
- - doc/lispref/Makefile src/Makefile.c:src/Makefile.in \
- + doc/misc/Makefile \
- + src/Makefile.c:src/Makefile.in \
- lwlib/Makefile lisp/Makefile leim/Makefile, [
++ AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
++- doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
++- doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \
+++ doc/misc/Makefile \
+++ src/Makefile lwlib/Makefile lisp/Makefile \
++ leim/Makefile])
+
- ### Make the necessary directories, if they don't exist.
++ dnl test/ is not present in release tarfiles.
+diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
- index 201428e..bcaec12 100644
++index e387631..f28746f 100644
+--- a/doc/misc/Makefile.in
++++ b/doc/misc/Makefile.in
- @@ -38,104 +38,10 @@ MAKEINFO = makeinfo --force
++@@ -45,160 +45,13 @@ MAKEINFO_OPTS = --force -I$(emacsdir)
+
+ # Also add new entries to INFO_FILES in the top-level Makefile.in.
+ INFO_TARGETS = \
+- $(infodir)/ada-mode \
+- $(infodir)/auth \
+- $(infodir)/autotype \
+- $(infodir)/calc \
+- $(infodir)/ccmode \
+- $(infodir)/cl \
+- $(infodir)/dbus \
+- $(infodir)/dired-x \
+- $(infodir)/ebrowse \
+- $(infodir)/ede \
+- $(infodir)/ediff \
+- $(infodir)/edt \
+- $(infodir)/eieio \
+- $(infodir)/emacs-mime \
+- $(infodir)/epa \
+- $(infodir)/erc \
++- $(infodir)/ert \
+- $(infodir)/eshell \
+- $(infodir)/eudc \
+- $(infodir)/efaq \
+- $(infodir)/flymake \
+- $(infodir)/forms \
+- $(infodir)/gnus \
++- $(infodir)/emacs-gnutls \
+- $(infodir)/idlwave \
+- $(infodir)/info \
+- $(infodir)/mairix-el \
+- $(infodir)/message \
+- $(infodir)/mh-e \
+- $(infodir)/newsticker \
+- $(infodir)/nxml-mode \
+- $(infodir)/org \
+- $(infodir)/pcl-cvs \
+- $(infodir)/pgg \
+- $(infodir)/rcirc \
+- $(infodir)/remember \
+- $(infodir)/reftex \
+- $(infodir)/sasl \
+- $(infodir)/sc \
+- $(infodir)/semantic \
+- $(infodir)/ses \
+- $(infodir)/sieve \
+- $(infodir)/smtpmail \
+- $(infodir)/speedbar \
+- $(infodir)/tramp \
+- $(infodir)/url \
+- $(infodir)/vip \
+- $(infodir)/viper \
+- $(infodir)/widget \
+- $(infodir)/woman
++ $(infodir)/efaq
+
+ DVI_TARGETS = \
+- ada-mode.dvi \
+- auth.dvi \
+- autotype.dvi \
+- calc.dvi \
+- cc-mode.dvi \
+- cl.dvi \
+- dbus.dvi \
+- dired-x.dvi \
+- ebrowse.dvi \
+- ede.dvi \
+- ediff.dvi \
+- edt.dvi \
+- eieio.dvi \
+- emacs-mime.dvi \
+- epa.dvi \
+- erc.dvi \
++- ert.dvi \
+- eshell.dvi \
+- eudc.dvi \
+- faq.dvi \
+- flymake.dvi \
+- forms.dvi \
+- gnus.dvi \
++- emacs-gnutls.dvi \
+- idlwave.dvi \
+- info.dvi \
+- mairix-el.dvi \
+- message.dvi \
+- mh-e.dvi \
+- newsticker.dvi \
+- nxml-mode.dvi \
+- org.dvi \
+- pcl-cvs.dvi \
+- pgg.dvi \
+- rcirc.dvi \
+- reftex.dvi \
+- remember.dvi \
+- sasl.dvi \
+- sc.dvi \
+- semantic.dvi \
+- ses.dvi \
+- sieve.dvi \
+- smtpmail.dvi \
+- speedbar.dvi \
+- tramp.dvi \
+- url.dvi \
+- vip.dvi \
+- viper.dvi \
+- widget.dvi \
+- woman.dvi
++ faq.dvi
+
+ PDF_TARGETS = \
- ada-mode.pdf \
- @@ -198,10 +104,7 @@ TEXI2PDF = texi2pdf
- ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
-
-
- -info: $(infodir) $(INFO_TARGETS)
- -
- -$(infodir):
- - mkdir $@
- +info: $(INFO_TARGETS)
++- ada-mode.pdf \
++- auth.pdf \
++- autotype.pdf \
++- calc.pdf \
++- cc-mode.pdf \
++- cl.pdf \
++- dbus.pdf \
++- dired-x.pdf \
++- ebrowse.pdf \
++- ede.pdf \
++- ediff.pdf \
++- edt.pdf \
++- eieio.pdf \
++- emacs-mime.pdf \
++- epa.pdf \
++- erc.pdf \
++- ert.pdf \
++- eshell.pdf \
++- eudc.pdf \
++- faq.pdf \
++- flymake.pdf \
++- forms.pdf \
++- gnus.pdf \
++- emacs-gnutls.pdf \
++- idlwave.pdf \
++- info.pdf \
++- mairix-el.pdf \
++- message.pdf \
++- mh-e.pdf \
++- newsticker.pdf \
++- nxml-mode.pdf \
++- org.pdf \
++- pcl-cvs.pdf \
++- pgg.pdf \
++- rcirc.pdf \
++- reftex.pdf \
++- remember.pdf \
++- sasl.pdf \
++- sc.pdf \
++- semantic.pdf \
++- ses.pdf \
++- sieve.pdf \
++- smtpmail.pdf \
++- speedbar.pdf \
++- tramp.pdf \
++- url.pdf \
++- vip.pdf \
++- viper.pdf \
++- widget.pdf \
++- woman.pdf
+++ faq.pdf
+
- dvi: $(DVI_TARGETS)
++ HTML_TARGETS = emacs-faq.html
+
- @@ -213,150 +116,6 @@ pdf: $(PDF_TARGETS)
- # In a distribution of Emacs, the Info files should be up to date.
++@@ -230,186 +83,6 @@ pdf: $(PDF_TARGETS)
++ # Note: "<" is not portable in ordinary make rules.
+
+ ## "short" target names for convenience, to just rebuild one manual.
+-ada-mode : $(infodir)/ada-mode
+-$(infodir)/ada-mode: ada-mode.texi
- - cd $(srcdir); $(MAKEINFO) ada-mode.texi
- -ada-mode.dvi: ada-mode.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi
++-ada-mode.dvi: ${srcdir}/ada-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
- -ada-mode.pdf: ada-mode.texi
++-ada-mode.pdf: ${srcdir}/ada-mode.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
+-
+-auth : $(infodir)/auth
+-$(infodir)/auth: auth.texi
- - cd $(srcdir); $(MAKEINFO) auth.texi
- -auth.dvi: auth.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi
++-auth.dvi: ${srcdir}/auth.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
- -auth.pdf: auth.texi
++-auth.pdf: ${srcdir}/auth.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
+-
+-autotype : $(infodir)/autotype
+-$(infodir)/autotype: autotype.texi
- - cd $(srcdir); $(MAKEINFO) autotype.texi
- -autotype.dvi: autotype.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi
++-autotype.dvi: ${srcdir}/autotype.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
- -autotype.pdf: autotype.texi
++-autotype.pdf: ${srcdir}/autotype.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
+-
+-calc : $(infodir)/calc
- -$(infodir)/calc: calc.texi
- - cd $(srcdir); $(MAKEINFO) calc.texi
- -calc.dvi: calc.texi
++-$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi
++-calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
- -calc.pdf: calc.texi
++-calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
+-
+-ccmode : $(infodir)/ccmode
+-$(infodir)/ccmode: cc-mode.texi
- - cd $(srcdir); $(MAKEINFO) cc-mode.texi
- -cc-mode.dvi: cc-mode.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi
++-cc-mode.dvi: ${srcdir}/cc-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
- -cc-mode.pdf: cc-mode.texi
++-cc-mode.pdf: ${srcdir}/cc-mode.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
+-
+-cl : $(infodir)/cl
+-$(infodir)/cl: cl.texi
- - cd $(srcdir); $(MAKEINFO) cl.texi
- -cl.dvi: cl.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi
++-cl.dvi: ${srcdir}/cl.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
- -cl.pdf: cl.texi
++-cl.pdf: ${srcdir}/cl.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
+-
+-dbus : $(infodir)/dbus
+-$(infodir)/dbus: dbus.texi
- - cd $(srcdir); $(MAKEINFO) dbus.texi
- -dbus.dvi: dbus.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi
++-dbus.dvi: ${srcdir}/dbus.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
- -dbus.pdf: dbus.texi
++-dbus.pdf: ${srcdir}/dbus.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
+-
+-dired-x : $(infodir)/dired-x
- -$(infodir)/dired-x: dired-x.texi
- - cd $(srcdir); $(MAKEINFO) dired-x.texi
- -dired-x.dvi: dired-x.texi
++-$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi
++-dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
- -dired-x.pdf: dired-x.texi
++-dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
+-
+-ebrowse : $(infodir)/ebrowse
+-$(infodir)/ebrowse: ebrowse.texi
- - cd $(srcdir); $(MAKEINFO) ebrowse.texi
- -ebrowse.dvi: ebrowse.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi
++-ebrowse.dvi: ${srcdir}/ebrowse.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
- -ebrowse.pdf: ebrowse.texi
++-ebrowse.pdf: ${srcdir}/ebrowse.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
+-
+-ede : $(infodir)/ede
+-$(infodir)/ede: ede.texi
- - cd $(srcdir); $(MAKEINFO) ede.texi
- -ede.dvi: ede.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ede.texi
++-ede.dvi: ${srcdir}/ede.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
- -ede.pdf: ede.texi
++-ede.pdf: ${srcdir}/ede.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
+-
+-ediff : $(infodir)/ediff
+-$(infodir)/ediff: ediff.texi
- - cd $(srcdir); $(MAKEINFO) ediff.texi
- -ediff.dvi: ediff.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi
++-ediff.dvi: ${srcdir}/ediff.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
- -ediff.pdf: ediff.texi
++-ediff.pdf: ${srcdir}/ediff.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
+-
+-edt : $(infodir)/edt
+-$(infodir)/edt: edt.texi
- - cd $(srcdir); $(MAKEINFO) edt.texi
- -edt.dvi: edt.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi
++-edt.dvi: ${srcdir}/edt.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
- -edt.pdf: edt.texi
++-edt.pdf: ${srcdir}/edt.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
+-
+-eieio : $(infodir)/eieio
+-$(infodir)/eieio: eieio.texi
- - cd $(srcdir); $(MAKEINFO) eieio.texi
- -eieio.dvi: eieio.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi
++-eieio.dvi: ${srcdir}/eieio.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
- -eieio.pdf: eieio.texi
++-eieio.pdf: ${srcdir}/eieio.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
+-
++-emacs-gnutls : $(infodir)/emacs-gnutls
++-$(infodir)/emacs-gnutls: emacs-gnutls.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi
++-emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi
++-emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
++-
+-emacs-mime : $(infodir)/emacs-mime
+-$(infodir)/emacs-mime: emacs-mime.texi
- - cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
- -emacs-mime.dvi: emacs-mime.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi
++-emacs-mime.dvi: ${srcdir}/emacs-mime.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
- -emacs-mime.pdf: emacs-mime.texi
++-emacs-mime.pdf: ${srcdir}/emacs-mime.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
+-
+-epa : $(infodir)/epa
+-$(infodir)/epa: epa.texi
- - cd $(srcdir); $(MAKEINFO) epa.texi
- -epa.dvi: epa.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) epa.texi
++-epa.dvi: ${srcdir}/epa.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
- -epa.pdf: epa.texi
++-epa.pdf: ${srcdir}/epa.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
+-
+-erc : $(infodir)/erc
+-$(infodir)/erc: erc.texi
- - cd $(srcdir); $(MAKEINFO) erc.texi
- -erc.dvi: erc.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi
++-erc.dvi: ${srcdir}/erc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
- -erc.pdf: erc.texi
++-erc.pdf: ${srcdir}/erc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
+-
++-ert : $(infodir)/ert
++-$(infodir)/ert: ert.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ert.texi
++-ert.dvi: ${srcdir}/ert.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
++-ert.pdf: ${srcdir}/ert.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
++-
+-eshell : $(infodir)/eshell
+-$(infodir)/eshell: eshell.texi
- - cd $(srcdir); $(MAKEINFO) eshell.texi
- -eshell.dvi: eshell.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi
++-eshell.dvi: ${srcdir}/eshell.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
- -eshell.pdf: eshell.texi
++-eshell.pdf: ${srcdir}/eshell.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
+-
+-eudc : $(infodir)/eudc
+-$(infodir)/eudc: eudc.texi
- - cd $(srcdir); $(MAKEINFO) eudc.texi
- -eudc.dvi: eudc.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi
++-eudc.dvi: ${srcdir}/eudc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
- -eudc.pdf: eudc.texi
++-eudc.pdf: ${srcdir}/eudc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
+-
+ efaq : $(infodir)/efaq
- $(infodir)/efaq: faq.texi
- cd $(srcdir); $(MAKEINFO) faq.texi
- @@ -365,249 +124,6 @@ faq.dvi: faq.texi
- faq.pdf: faq.texi
- $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
++ $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
++ $(mkinfodir)
++@@ -428,280 +101,6 @@ emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
++ emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
++ $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
+
+-flymake : $(infodir)/flymake
+-$(infodir)/flymake: flymake.texi
- - cd $(srcdir); $(MAKEINFO) flymake.texi
- -flymake.dvi: flymake.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi
++-flymake.dvi: ${srcdir}/flymake.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
- -flymake.pdf: flymake.texi
++-flymake.pdf: ${srcdir}/flymake.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
+-
+-forms : $(infodir)/forms
+-$(infodir)/forms: forms.texi
- - cd $(srcdir); $(MAKEINFO) forms.texi
- -forms.dvi: forms.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi
++-forms.dvi: ${srcdir}/forms.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
- -forms.pdf: forms.texi
++-forms.pdf: ${srcdir}/forms.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
+-
+-# gnus/message/emacs-mime/sieve/pgg are part of Gnus:
+-gnus : $(infodir)/gnus
+-$(infodir)/gnus: gnus.texi gnus-faq.texi
- - cd $(srcdir); $(MAKEINFO) gnus.texi
- -gnus.dvi: gnus.texi gnus-faq.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi
++-gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi
+- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+- $(ENVADD) $(TEXI2DVI) gnustmp.texi
- - cp gnustmp.dvi $*.dvi
++- cp gnustmp.dvi $@
+- rm gnustmp.*
- -gnus.pdf: gnus.texi gnus-faq.texi
++-gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi
+- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+- $(ENVADD) $(TEXI2PDF) gnustmp.texi
+- cp gnustmp.pdf $@
+- rm gnustmp.*
+-
+-# This is produced with --no-split to avoid making files whose
+-# names clash on DOS 8+3 filesystems
+-idlwave : $(infodir)/idlwave
+-$(infodir)/idlwave: idlwave.texi
- - cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
- -idlwave.dvi: idlwave.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi
++-idlwave.dvi: ${srcdir}/idlwave.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
- -idlwave.pdf: idlwave.texi
++-idlwave.pdf: ${srcdir}/idlwave.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
+-
+-# The following target uses an explicit -o switch to work around
+-# the @setfilename directive in info.texi, which is required for
+-# the Texinfo distribution.
+-###info : $(infodir)/info # circular!
+-$(infodir)/info: info.texi
- - cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
- -info.dvi: info.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi
++-info.dvi: ${srcdir}/info.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
- -info.pdf: info.texi
++-info.pdf: ${srcdir}/info.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
+-
+-mairix-el : $(infodir)/mairix-el
+-$(infodir)/mairix-el: mairix-el.texi
- - cd $(srcdir); $(MAKEINFO) mairix-el.texi
- -mairix-el.dvi: mairix-el.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi
++-mairix-el.dvi: ${srcdir}/mairix-el.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
- -mairix-el.pdf: mairix-el.texi
++-mairix-el.pdf: ${srcdir}/mairix-el.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
+-
+-message : $(infodir)/message
+-$(infodir)/message: message.texi
- - cd $(srcdir); $(MAKEINFO) message.texi
- -message.dvi: message.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) message.texi
++-message.dvi: ${srcdir}/message.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
- -message.pdf: message.texi
++-message.pdf: ${srcdir}/message.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
+-
+-mh-e : $(infodir)/mh-e
+-$(infodir)/mh-e: mh-e.texi
- - cd $(srcdir); $(MAKEINFO) mh-e.texi
- -mh-e.dvi: mh-e.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi
++-mh-e.dvi: ${srcdir}/mh-e.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
- -mh-e.pdf: mh-e.texi
++-mh-e.pdf: ${srcdir}/mh-e.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
+-
+-newsticker : $(infodir)/newsticker
+-$(infodir)/newsticker: newsticker.texi
- - cd $(srcdir); $(MAKEINFO) newsticker.texi
- -newsticker.dvi: newsticker.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi
++-newsticker.dvi: ${srcdir}/newsticker.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
- -newsticker.pdf: newsticker.texi
++-newsticker.pdf: ${srcdir}/newsticker.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
+-
+-nxml-mode : $(infodir)/nxml-mode
+-$(infodir)/nxml-mode: nxml-mode.texi
- - cd $(srcdir); $(MAKEINFO) nxml-mode.texi
- -nxml-mode.dvi: nxml-mode.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi
++-nxml-mode.dvi: ${srcdir}/nxml-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
- -nxml-mode.pdf: nxml-mode.texi
++-nxml-mode.pdf: ${srcdir}/nxml-mode.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
+-
+-org : $(infodir)/org
+-$(infodir)/org: org.texi
- - cd $(srcdir); $(MAKEINFO) org.texi
- -org.dvi: org.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) org.texi
++-org.dvi: ${srcdir}/org.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
- -org.pdf: org.texi
++-org.pdf: ${srcdir}/org.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
+-
+-pcl-cvs : $(infodir)/pcl-cvs
+-$(infodir)/pcl-cvs: pcl-cvs.texi
- - cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
- -pcl-cvs.dvi: pcl-cvs.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi
++-pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
- -pcl-cvs.pdf: pcl-cvs.texi
++-pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
+-
+-pgg : $(infodir)/pgg
+-$(infodir)/pgg: pgg.texi
- - cd $(srcdir); $(MAKEINFO) pgg.texi
- -pgg.dvi: pgg.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi
++-pgg.dvi: ${srcdir}/pgg.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
- -pgg.pdf: pgg.texi
++-pgg.pdf: ${srcdir}/pgg.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
+-
+-rcirc : $(infodir)/rcirc
+-$(infodir)/rcirc: rcirc.texi
- - cd $(srcdir); $(MAKEINFO) rcirc.texi
- -rcirc.dvi: rcirc.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi
++-rcirc.dvi: ${srcdir}/rcirc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
- -rcirc.pdf: rcirc.texi
++-rcirc.pdf: ${srcdir}/rcirc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
+-
+-reftex : $(infodir)/reftex
+-$(infodir)/reftex: reftex.texi
- - cd $(srcdir); $(MAKEINFO) reftex.texi
- -reftex.dvi: reftex.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi
++-reftex.dvi: ${srcdir}/reftex.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
- -reftex.pdf: reftex.texi
++-reftex.pdf: ${srcdir}/reftex.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
+-
+-remember : $(infodir)/remember
+-$(infodir)/remember: remember.texi
- - cd $(srcdir); $(MAKEINFO) remember.texi
- -remember.dvi: remember.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi
++-remember.dvi: ${srcdir}/remember.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
- -remember.pdf: remember.texi
++-remember.pdf: ${srcdir}/remember.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
+-
+-sasl : $(infodir)/sasl
+-$(infodir)/sasl: sasl.texi
- - cd $(srcdir); $(MAKEINFO) sasl.texi
- -sasl.dvi: sasl.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi
++-sasl.dvi: ${srcdir}/sasl.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
- -sasl.pdf: sasl.texi
++-sasl.pdf: ${srcdir}/sasl.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
+-
+-sc : $(infodir)/sc
+-$(infodir)/sc: sc.texi
- - cd $(srcdir); $(MAKEINFO) sc.texi
- -sc.dvi: sc.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi
++-sc.dvi: ${srcdir}/sc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
- -sc.pdf: sc.texi
++-sc.pdf: ${srcdir}/sc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
+-
+-semantic : $(infodir)/semantic
+-$(infodir)/semantic: semantic.texi sem-user.texi
- - cd $(srcdir); $(MAKEINFO) semantic.texi
- -semantic.dvi: semantic.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi
++-semantic.dvi: ${srcdir}/semantic.texi sem-user.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
- -semantic.pdf: semantic.texi
++-semantic.pdf: ${srcdir}/semantic.texi sem-user.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
+-
+-ses : $(infodir)/ses
+-$(infodir)/ses: ses.texi
- - cd $(srcdir); $(MAKEINFO) ses.texi
- -ses.dvi: ses.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi
++-ses.dvi: ${srcdir}/ses.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
- -ses.pdf: ses.texi
++-ses.pdf: ${srcdir}/ses.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
+-
+-sieve : $(infodir)/sieve
+-$(infodir)/sieve: sieve.texi
- - cd $(srcdir); $(MAKEINFO) sieve.texi
- -sieve.dvi: sieve.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi
++-sieve.dvi: ${srcdir}/sieve.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
- -sieve.pdf: sieve.texi
++-sieve.pdf: ${srcdir}/sieve.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
+-
+-smtpmail : $(infodir)/smtpmail
+-$(infodir)/smtpmail: smtpmail.texi
- - cd $(srcdir); $(MAKEINFO) smtpmail.texi
- -smtpmail.dvi: smtpmail.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi
++-smtpmail.dvi: ${srcdir}/smtpmail.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
- -smtpmail.pdf: smtpmail.texi
++-smtpmail.pdf: ${srcdir}/smtpmail.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
+-
+-speedbar : $(infodir)/speedbar
+-$(infodir)/speedbar: speedbar.texi
- - cd $(srcdir); $(MAKEINFO) speedbar.texi
- -speedbar.dvi: speedbar.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi
++-speedbar.dvi: ${srcdir}/speedbar.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
- -speedbar.pdf: speedbar.texi
++-speedbar.pdf: ${srcdir}/speedbar.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
+-
+-tramp : $(infodir)/tramp
+-$(infodir)/tramp: tramp.texi trampver.texi
- - cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
- -tramp.dvi: tramp.texi trampver.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs tramp.texi
++-tramp.dvi: ${srcdir}/tramp.texi trampver.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
- -tramp.pdf: tramp.texi trampver.texi
++-tramp.pdf: ${srcdir}/tramp.texi trampver.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
+-
+-url : $(infodir)/url
+-$(infodir)/url: url.texi
- - cd $(srcdir); $(MAKEINFO) url.texi
- -url.dvi: url.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) url.texi
++-url.dvi: ${srcdir}/url.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
- -url.pdf: url.texi
++-url.pdf: ${srcdir}/url.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
+-
+-vip : $(infodir)/vip
+-$(infodir)/vip: vip.texi
- - cd $(srcdir); $(MAKEINFO) vip.texi
- -vip.dvi: vip.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi
++-vip.dvi: ${srcdir}/vip.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
- -vip.pdf: vip.texi
++-vip.pdf: ${srcdir}/vip.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
+-
+-viper : $(infodir)/viper
+-$(infodir)/viper: viper.texi
- - cd $(srcdir); $(MAKEINFO) viper.texi
- -viper.dvi: viper.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi
++-viper.dvi: ${srcdir}/viper.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
- -viper.pdf: viper.texi
++-viper.pdf: ${srcdir}/viper.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
+-
+-widget : $(infodir)/widget
+-$(infodir)/widget: widget.texi
- - cd $(srcdir); $(MAKEINFO) widget.texi
- -widget.dvi: widget.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi
++-widget.dvi: ${srcdir}/widget.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
- -widget.pdf: widget.texi
++-widget.pdf: ${srcdir}/widget.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
+-
+-woman : $(infodir)/woman
+-$(infodir)/woman: woman.texi
- - cd $(srcdir); $(MAKEINFO) woman.texi
- -woman.dvi: woman.texi
++- $(mkinfodir)
++- cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi
++-woman.dvi: ${srcdir}/woman.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
- -woman.pdf: woman.texi
++-woman.pdf: ${srcdir}/woman.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
-
++-
++-
++ .PHONY: mostlyclean clean distclean maintainer-clean
+
+ mostlyclean:
+diff --git a/lisp/help.el b/lisp/help.el
- index 84692c4..6d96e57 100644
++index 317d5cf..58e28f9 100644
+--- a/lisp/help.el
++++ b/lisp/help.el
- @@ -301,6 +301,14 @@ If that doesn't give a function, return nil."
++@@ -286,6 +286,14 @@ If that doesn't give a function, return nil."
+ (goto-address-mode 1)
+ (goto-char (point-min)))
+
++(defun debian-expand-file-name-dfsg (filename)
++ "Apply expand-file-name to FILENAME.
++If expand-file-name does not find a file, append `.dfsg' and try again."
++ (let ((file (expand-file-name filename data-directory)))
++ (if (file-exists-p file)
++ file
++ (expand-file-name (concat file ".dfsg") data-directory))))
++
+ (defun describe-distribution ()
+ "Display info on how to obtain the latest version of GNU Emacs."
+ (interactive)
- @@ -314,7 +322,7 @@ If that doesn't give a function, return nil."
++@@ -299,7 +307,7 @@ If that doesn't give a function, return nil."
+ (defun describe-gnu-project ()
+ "Display info on the GNU project."
+ (interactive)
+- (view-help-file "THE-GNU-PROJECT"))
++ (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT")))
+
+ (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
+
projects / emacs.git / commitdiff